bitkeeper revision 1.1389.15.11 (428212beixWz2Ftz7Wj0NeY03LmBnA)

sched.h, dom0_ops.h, dom0_ops.c, xc_domain.c, xc.h:
  Minor cleanups.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h
index 861285bb94d80567c818665db10444aac9d00e6a..68a1fb6abc53c88f359464cb99ae106ebdacb8b3 100644 (file)
--- a/tools/libxc/xc.h
+++ b/tools/libxc/xc.h
@@ -119,7 +119,7 @@ typedef struct {
     unsigned long shared_info_frame;
     u64           cpu_time;
     unsigned long max_memkb;
-    u32           vcpu_to_cpu[MAX_VIRT_CPUS];
+    s32           vcpu_to_cpu[MAX_VIRT_CPUS];
     cpumap_t      cpumap[MAX_VIRT_CPUS];
 } xc_dominfo_t;
 

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 4cb65dbfbb19c8691bf4ab39520df0269915aed6..12a724b2f2c4e0b908e4ca29651db51cda28c84e 100644 (file)
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -17,7 +17,7 @@ int xc_domain_create(int xc_handle,
     int err, errno_saved;
     dom0_op_t op;
     u32 vcpu = 0; /* FIXME, hard coded initial pin to vcpu 0 */
-    cpumap_t cpumap = 1<<cpu;
+    cpumap_t cpumap = 1 << cpu;
 
     op.cmd = DOM0_CREATEDOMAIN;
     op.u.createdomain.domain = (domid_t)*pdomid;
@@ -137,10 +137,10 @@ int xc_domain_getinfo(int xc_handle,
         info->shared_info_frame = op.u.getdomaininfo.shared_info_frame;
         info->cpu_time = op.u.getdomaininfo.cpu_time;
         info->vcpus = op.u.getdomaininfo.n_vcpu;
-        memcpy(info->vcpu_to_cpu, &op.u.getdomaininfo.vcpu_to_cpu, 
-               MAX_VIRT_CPUS*sizeof(u32));
-        memcpy(info->cpumap, &op.u.getdomaininfo.cpumap, 
-               MAX_VIRT_CPUS*sizeof(cpumap_t));
+        memcpy(&info->vcpu_to_cpu, &op.u.getdomaininfo.vcpu_to_cpu, 
+               sizeof(info->vcpu_to_cpu));
+        memcpy(&info->cpumap, &op.u.getdomaininfo.cpumap, 
+               sizeof(info->cpumap));
 
         next_domid = (u16)op.u.getdomaininfo.domain + 1;
         info++;

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index 8963d5dbda92f9e53efc9f4ce139e99d408ffa8b..bae4a00caa5deab564df9fe6e6e270d1b45c8340 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -221,7 +221,7 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
         domid_t dom = op->u.pincpudomain.domain;
         struct domain *d = find_domain_by_id(dom);
         struct exec_domain *ed;
-        cpumap_t curmap, *cpumap = &curmap;
+        cpumap_t cpumap;
 
 
         if ( d == NULL )
@@ -253,8 +253,8 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
             break;
         }
 
-        if ( copy_from_user(cpumap, 
-                            op->u.pincpudomain.cpumap, sizeof(*cpumap)) )
+        if ( copy_from_user(&cpumap, op->u.pincpudomain.cpumap,
+                            sizeof(cpumap)) )
         {
             ret = -EFAULT;
             put_domain(d);
@@ -262,14 +262,14 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
         }
 
         /* update cpumap for this ed */
-        ed->cpumap = *(cpumap);
+        ed->cpumap = cpumap;
 
-        if ( *(cpumap) == CPUMAP_RUNANYWHERE )
+        if ( cpumap == CPUMAP_RUNANYWHERE )
             clear_bit(EDF_CPUPINNED, &ed->flags);
         else
         {
             /* pick a new cpu from the usable map */
-            int new_cpu = (int)find_first_set_bit(*(cpumap)) % smp_num_cpus;
+            int new_cpu = (int)find_first_set_bit(cpumap) % smp_num_cpus;
 
             exec_domain_pause(ed);
             if ( ed->processor != new_cpu )
@@ -329,7 +329,10 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
             break;
         }
         
-        memset(&op->u.getdomaininfo.vcpu_to_cpu,-1,MAX_VIRT_CPUS*sizeof(u8));
+        memset(&op->u.getdomaininfo.vcpu_to_cpu, -1,
+               sizeof(op->u.getdomaininfo.vcpu_to_cpu));
+        memset(&op->u.getdomaininfo.cpumap, 0,
+               sizeof(op->u.getdomaininfo.cpumap));
         for_each_exec_domain ( d, ed ) {
             op->u.getdomaininfo.vcpu_to_cpu[ed->id] = ed->processor;
             op->u.getdomaininfo.cpumap[ed->id]      = ed->cpumap;

diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h
index d27a7f0ac1a7c29c76923d4110d1706814d5c5b7..d52c5de13c54ee3c81617b126c090551aa780ceb 100644 (file)
--- a/xen/include/public/dom0_ops.h
+++ b/xen/include/public/dom0_ops.h
@@ -89,7 +89,7 @@ typedef struct {
     memory_t shared_info_frame;       /* MFN of shared_info struct */
     u64      cpu_time;
     u32      n_vcpu;
-    u32      vcpu_to_cpu[MAX_VIRT_CPUS];  /* current mapping   */
+    s32      vcpu_to_cpu[MAX_VIRT_CPUS];  /* current mapping   */
     cpumap_t cpumap[MAX_VIRT_CPUS];       /* allowable mapping */
 } dom0_getdomaininfo_t;
 

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 7ab3e0fa932294c100d4dc324bfcd59fbe78b53e..dd4b95b1dcf0dcc9c772fa323d8fe0e21eb5a72a 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -58,8 +58,8 @@ int  init_event_channels(struct domain *d);
 void destroy_event_channels(struct domain *d);
 int  init_exec_domain_event_channels(struct exec_domain *ed);
 
-
 #define CPUMAP_RUNANYWHERE 0xFFFFFFFF
+
 struct exec_domain 
 {
     int              id;
@@ -86,7 +86,7 @@ struct exec_domain
 
     atomic_t         pausecnt;
 
-    cpumap_t  cpumap;               /* which cpus this domain can run on */
+    cpumap_t         cpumap;        /* which cpus this domain can run on */
 
     struct arch_exec_domain arch;
 };